From: Jim Blandy <jimb@redhat.com>
Date: Mon, 14 Jun 1993 15:06:46 +0000 (+0000)
Subject: * xdisp.c (display_text_line): Use temporary variable.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~95334
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=142be3dd62a039410843e6995aae5f09419743d4;p=emacs.git

* xdisp.c (display_text_line): Use temporary variable.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 62a029c818d..e9777efee39 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2062,14 +2062,17 @@ display_text_line (w, start, vpos, hpos, taboffset)
       unsigned char *p = XSTRING (Voverlay_arrow_string)->data;
       int i;
       int len = XSTRING (Voverlay_arrow_string)->size;
+      int arrow_end;
 
       if (len > width)
 	len = width;
       for (i = 0; i < len; i++)
 	startp[i] = p[i];
-      if (desired_glyphs->used[vpos] <
-	  (len + startp - desired_glyphs->glyphs[vpos]))
-	desired_glyphs->used[vpos] = len + startp - desired_glyphs->glyphs[vpos];
+
+      /* Bug in SunOS 4.1.1 compiler requires this intermediate variable.  */
+      arrow_end = (startp - desired_glyphs->glyphs[vpos]) + len;
+      if (desired_glyphs->used[vpos] < arrow_end)
+	desired_glyphs->used[vpos] = arrow_end;
 
       overlay_arrow_seen = 1;
     }